| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-cvsexportcommit(1) |
| 2 | ====================== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git-cvsexportcommit - Export a commit to a CVS checkout |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| Junio C Hamano | 51c2ab0 | 2006-07-09 20:38:54 | [diff] [blame] | 11 | 'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 12 | |
| 13 | |
| 14 | DESCRIPTION |
| 15 | ----------- |
| 16 | Exports a commit from GIT to a CVS checkout, making it easier |
| 17 | to merge patches from a git repository into a CVS repository. |
| 18 | |
| 19 | Execute it from the root of the CVS working copy. GIT_DIR must be defined. |
| Junio C Hamano | 2e55244 | 2006-01-30 07:39:30 | [diff] [blame] | 20 | See examples below. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 21 | |
| 22 | It does its best to do the safe thing, it will check that the files are |
| 23 | unchanged and up to date in the CVS checkout, and it will not autocommit |
| 24 | by default. |
| 25 | |
| 26 | Supports file additions, removals, and commits that affect binary files. |
| 27 | |
| 28 | If the commit is a merge commit, you must tell git-cvsapplycommit what parent |
| 29 | should the changeset be done against. |
| 30 | |
| 31 | OPTIONS |
| 32 | ------- |
| 33 | |
| 34 | -c:: |
| 35 | Commit automatically if the patch applied cleanly. It will not |
| 36 | commit if any hunks fail to apply or there were other problems. |
| 37 | |
| 38 | -p:: |
| 39 | Be pedantic (paranoid) when applying patches. Invokes patch with |
| 40 | --fuzz=0 |
| 41 | |
| Junio C Hamano | 0fd4dbd | 2006-05-14 09:22:52 | [diff] [blame] | 42 | -f:: |
| 43 | Force the merge even if the files are not up to date. |
| 44 | |
| 45 | -m:: |
| 46 | Prepend the commit message with the provided prefix. |
| 47 | Useful for patch series and the like. |
| 48 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 49 | -v:: |
| 50 | Verbose. |
| 51 | |
| Junio C Hamano | 2e55244 | 2006-01-30 07:39:30 | [diff] [blame] | 52 | EXAMPLES |
| 53 | -------- |
| 54 | |
| 55 | Merge one patch into CVS:: |
| 56 | + |
| 57 | ------------ |
| 58 | $ export GIT_DIR=~/project/.git |
| 59 | $ cd ~/project_cvs_checkout |
| 60 | $ git-cvsexportcommit -v <commit-sha1> |
| 61 | $ cvs commit -F .mgs <files> |
| 62 | ------------ |
| 63 | |
| 64 | Merge pending patches into CVS automatically -- only if you really know what you are doing :: |
| 65 | + |
| 66 | ------------ |
| 67 | $ export GIT_DIR=~/project/.git |
| 68 | $ cd ~/project_cvs_checkout |
| 69 | $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v |
| 70 | ------------ |
| 71 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 72 | Author |
| 73 | ------ |
| 74 | Written by Martin Langhoff <martin@catalyst.net.nz> |
| 75 | |
| 76 | Documentation |
| 77 | -------------- |
| 78 | Documentation by Martin Langhoff <martin@catalyst.net.nz> |
| 79 | |
| 80 | GIT |
| 81 | --- |
| 82 | Part of the gitlink:git[7] suite |
| 83 | |
